Revision: bazaar--devel--1.1--patch-43
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Fri Dec 10 03:57:09 EST 2004
Standard-date: 2004-12-09 16:57:09 GMT
Modified-files: libarch/apply-changeset.c
    tests/test-star-merge.sh
New-patches: robert.collins@canonical.com--general/bazaar--devel--1.1--patch-43
    robert.collins@canonical.com--general/bazaar--merge--1.1--base-0
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-1
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-2
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-3
Summary: merge conflict detection fix from robert.collins@canonical.com--general/bazaar--merge--1.1
Keywords: 

Patches applied:

 * robert.collins@canonical.com--general/bazaar--merge--1.1--base-0
   tag of robert.collins@canonical.com--general/bazaar--devel--1.1--patch-41

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-1
   test three-way does not conflict on repeated hunks

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-2
   trivial test for merge3 merging of hunks

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-3
   fix up star-merge three way conflict detection

